Merge from gnulib.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 23 Jun 2011 08:12:57 +0000 (01:12 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 23 Jun 2011 08:12:57 +0000 (01:12 -0700)

Trivial merge